From: Zhang Xiantao <xiantao.zhang@intel.com>
Date: Fri, 24 Aug 2012 08:49:47 +0000 (+0100)
Subject: nested vmx: Don't set bit 55 in IA32_VMX_BASIC_MSR
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8023
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=84fa4c35b40f364210fe3f5836f4fcc6df60ee14;p=xen.git

nested vmx: Don't set bit 55 in IA32_VMX_BASIC_MSR

All related IA32_VMX_TRUE_*_MSR are not implemented,
so set this bit to 0, otherwise system L1VMM may
get incorrect default1 class settings.

Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 2e0b79dc2d..55781e9b6c 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1290,7 +1290,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
     switch (msr) {
     case MSR_IA32_VMX_BASIC:
         data = VVMCS_REVISION | ((u64)PAGE_SIZE) << 32 | 
-               ((u64)MTRR_TYPE_WRBACK) << 50 | (1ULL << 55);
+               ((u64)MTRR_TYPE_WRBACK) << 50;
         break;
     case MSR_IA32_VMX_PINBASED_CTLS:
         /* 1-seetings */